Removed the log-file
Fixed bugs and made some minor tweaks