Feature 84, Add missing implementation of  #81, #82, #84, improve #99

Pair programming with Matthias Hafner.