Bug fixes

 * Make things neater
 * Fix ship placement failures
 * Add TODO