Whoops. got sidetracked. Mostly fixed errors