merge brett updates

lots of stuff for fitting and systematics