Added a quick and dirty debug mode; made some trivial method name changes and similar changes to output