fixed all of the actions