optimized ocean logic, removed unused field vars
Merged Thomas changes and cleaned stuff up