changed logger/hardcoded strings etc