binned fit and other modifications