update comments
fix color issue