Fixed some of the problems of 2nd part, added solutions