Cleanup, identified more possible problem areas, whittled away at bug, and i forget rest now shouldn't be up this late javaing