ToolForm: Improve validation, minor fixes