No timeout, fixed a few bugs