Action management

Added some missing options, simplified parameter checking