fix a wrong comment and various very minor stuff