adding timing
more timing
various cleanup
cleanup