Nightly update (05.04.)

bugfixes