added two tables made other minor updates