merged Janniks stuff

Please enter the commit message for your changes. Lines starting