Fix timeout was not using parameter

Also added dispose cleanup code for any waiting requests