Commit @ 34000 feet above sea level: Bugfix & removed some debugging code. Ready to be tested by Jim.