Fixed Entity class and implemented hacks to allow for 2 characters