Waterfallfixes

some fixes from @tothandras

some more to come