changes: tobis and mine

see individual comments