fixed a couple of errors and my timeouts