Improved read timeout
Improved read timeout (w32)
[WIP] Comment out unused functions