updated colors and comments