author is team mettriegel, little bugfixes