moved some stuff around, fixed typos