refactor actor stepping/fixing source