parameter_estimation - miscellaneous bugfixes