lots of small cleanups, including checking if we are on the boat before initializing the database