Added form validators
Added form validators, removed debugging code