Timing fixes!

Along with documentation and some cosmetic tweaks.