Some corrections
Final corrections for V3