Properly formatted, added timing; almost ready for release