minor commit; moving some stuff around