clean up marine models and add indexing of 'draft' field