Entity fixes and tick event
Minor bug fixes (speed issue not fixed)