Corrections and fixes in the comments