Patch 18

Fixes for marine bhop and some mod compatibility.