moving order around
fix typos