changed method names, added new action

some comments