unfinished updates to the timeouts
fixing up the timeouts - tested and working now | TODO: figure out proper hard limits
Merge branch 'broken_build'