Corrections and new parts added