Comments and little touch ups