nextform improvements