Added a simple tester class for debugging, and tweaked things somewhat.