moved some stuff around
fixed a typo