improves Form, callbacks etc, tidy up