fixed entity system :)