about to fix color scaling
Fixed conflicts
refined step increase for speed