Getting things right

a little Blumenstrauß of fixes for you ;)