added timing tools
removed timing, improved performance