touch up form + db hooks