Mariculture Stuff + Few fixes