Comments and fixes