moved some stuff around, minor edits