filling out more sections, moving some stuff around, cleaning up