changed some colors and such