NEI Integration + tweaks