Andrew's fixes for pick ships consolidated

Consolidated my changes with Jordan's, fixed placement of ships on the border