Added a bunch of fish and other nutrients. Also did some renames for more consistent naming.