Continued bugfixing (Added console output)