tightening up
some comments