reordered stuff
typos