update form fields & fix small bugs