back to better clustering in the high intensity area, bug fixes for the shift