added columns in tables and fixed several minor issues