commenting and some polish [MJ-342]
validating forms work correctly, tests need updated [MJ-342]