Fixed comments
Changed some colors