Misc fixes

Mostly timeouts and misc naming things.
This changes the method signature.  But since the method has only been in the codebase for about 5 minutes, that's probably ok.