More progress on NEI, also some fishing/bait changes implementd