fixed typos, put rearranged some sections