making some debugging changes & things mostly work