Tweak ship numbers a bit more
fix coordinates not displaying properly
Merge origin/master