Timeout & Bug Fixes