updates to modelform handling