Rearranged things and fixed some sections