cleaning up some names, triming unused/commented out source, adding some test cases that fail without telling me why