Fixed entity and player system; fixes #6