work on some benchmarks and performance changes
general code cleanup and performance increases. Approx 80% of original runtime