Fixed several bugs and commented out timeouts