wp/CAROLINE-37/1: stylefix and some documentation added.