some small fix about the forms not saving