Bug fixes for boats project.
Merge branch 'master' of github.com:lubyk/lubyk