Model validation, new actions, some minor changes