Added else to if statements, added forms and form questions, added data types