several bugfixes by Oli90

fixed several issues