add magnificent comment-functionality, hide some bugs here and there