Lots of stuff

Poppy's NEI integration
A couple of fixes.