Add more actions, remove some bugs