Fixed minor tracking bugs

+ implemented first step of form validator