Fixed bugs
TODO: iterate form fields