Make small corrections and some changes

Some necessary changes (2, I think), some suggestions, and redesign to refit.