Removed zerospeed fix, added TODO for error calculation