Dealt with issues 1,2,4-7,9,12,15,16. Mostly minor changes and bug fixes.