Updated Entity system & stuff
correction of small derps