Various NEI tweaks done properly now.