Bugfix and comments.