Merge shell names and fixed binning stuff

ready to go.