Release (0.9.9) final bug fixes and adjustments