Misc updates, including better ASR estimator.
Merge branch 'misc_updates' into devel