fix compile errors, draws a ship
Merge branch 'master' into build-errors