changed colors, minor teaks