Oeil: code improvement, bug fixes