Improved fitting

Data: clean up code
MC: play with CB tail settings