colors changed and some other fixes