add comments, add small adjustments