some updates
fixed optional form fields