More work on Action phase fixing bugs etc.