Better Logging and some gui improvements