Updated background fitting and more