typos and update
clean up and move things around