Implement missing NMS entity types
Squash some bugs