Fixed validation messages /f controller, code edits