Cleaned up some entities (only looks)
MOAR PRETTINESS