Clean up comments.
maxBufferTime timeout is now smarter.
Lots of logs, works slightly better.