Added some Entity stuff, bug fixed some map stuff