Cleaned up code
Added boat protection from players