Adding timeouts so reads do not block indefinitely and we can close properly
Updating comments; cleanup