Made some changes in validators. Has to be looked at at some point.
Merged in devevlop-todo-validatorchanges