fixed some of the suggestions by Katja
conflict resolved