v1.8.5:
Minor fixes; preparing for alpha 1.0.0