various tweaks to modelleling and fitting