Output changes (issues #253 (closed) , #254 (closed) , #255 (closed) , #256 (closed)) as well as minor change (issue #257 (closed)). Usage of the new methods to be applied as a later patch.