Update for 0.8.6: Refinements and bugfixes