made more updates to forms and table