Implement behaviour of some actions and other minor changes