Fixed Comment bugs, few still remaining