updates to fix color issues