Comments and minor nitpicks