First round of changes after Como

don't need the comments at the end of the line