finished  action implementation and some minor changes