Tried (and failed) to fix moving entities. Will release a test build,
since it's been a while.