form, table and comments

update to all 3