Logging enabled plus better pw fix