fixing colors and shit