fixing colors and all