more NEI enhancement
Merge pull request #232 from way2muchnoise/nei-updates

more NEI enhancement