Feature 445 showhide+

continuation of #454. Since most parts of the original PR have already been merged in #455 this one only contains the parts concerning comments.