Mostly bugfixing, also edited Entity.h for a bit more standardizing