reorganize ships functionality
wow I made a ver unelegant fix to the code. time to go home. shuffling ships now works
merged charlie's changes