fixes and sphinx tuning