Minor update and fitting framework