Added addFormData(). Added checkbox methods. Minor refactoring