some code clean up, took out some dead code, fixed warnings in java code, control shifted and o'd the tests