added lots of codecomments, and think I gave up on the comment-merging-part
Merge branch 'wb'