buying a ship works now
Merge origin/master