Kick the habit of calling them Entities. They are Actors!

Also fix small collision bug