committing some minor changes before reset
tables merged! just don't click anything in the action menus