debug cleanup
added bench tool
STPSolver class
further refactoring