comments and some cosmetic modifications