Comments and some touch ups