Clean up to get 2.6 to run.  I also added the debug version stuff.
Still trying to get the debug version to work. Last save was lost.