minor changes, a bit more comments