A few more bug fixes, still some debug code.  Currently working on u functions, but not for the hard problem.