solved a few comments

implemented some change requests by hans
reworked according to hans and martin's comments

finalised ultimate draft