minor changes, more comments