fixing up the timeouts - tested and working now | TODO: figure out proper hard limits