Fix run-time bug + console output + comments