fixed a bunch of typos and layout