Mariculture integration and various cleanups