color scheme fix

and more misc changes