Fixing important issues with comments