Finalizing 0.8.5