Some updates to act edit. Need fixing, posting to avoid conflict damage
``