Fix bugs, improve speedbot