Commented ('#') bugs removed