Beyond a Coral Sea: Patch 1

Various bug fixes