Serious messing around with 'click to place' now pretty solid.

Couldn't resist making further changes to the pickliing, though.