Changed console output, bugfixes