Misc fixes

Mostly timeouts and misc naming things.
I agree it should. At the time it was written, the root doc didn't have that info. It does now.