Corrected some minor stuffs 2 part