Improved actions and some fix