Improved the NEI output a bit

Also added some forgotten entities