Misc fixes

Mostly timeouts and misc naming things.
Hmm... how was this method working before this line was added?  Wouldn't `$this->_readOnlyLinks` be null?