Fix ridiculous calling overhead. Required a bit of function renaming
Fix setting timeouts.