fixed dumb regression I caused, also removed bugs added yesterday.
Merge branch 'formvalidator-stupid-regression' into develop
keeping up