Touched some stuff up as well as adding to NEntity