Final Corrections implemented, post viva