fixed some issues, fine binning included