Bugfix and some comments
Small bugfix and more comments.