color changes and fixes