bugfix for actor move
refactor some