moving some stuff around, adding more comments."