Debugging progress
Moved timeout to else if and restart timer when an RTT has been calculated
Added back real top comments