made minor changes
removed (most) parameters from action functions