Feature 445 showhide+

continuation of #454. Since most parts of the original PR were already merged this one only containes the parts concerning comments.