Corrected a number of bugs and added support for using upload speed to determine choking.