many small fixes
fixed colors