Multiple changes

more comments,