form changes, db fix