minor changes
some comments here and there