Optlang: Some more preparatory work and corrections