Kamikaze fixes
Merge branch 'master' of https://github.com/Shipyards/Naval-Knockout