Add some actions and minor changes