cosmetic and commenting updates