Bug Fixes

Bug fixes with timeouts and using correct libraries

Signed-off-by: "Jake Champlin" <jchamplin@thedatacave.com>