Added Logfile, done some cleanup