Fixed a few issues

Replaced a bunch of TimeoutExceptions
Improved Reliability

Modified some areas of code to make them a bit more reliable