Final commit of code with all corrections