Some changes to actions and spawner
merge