made most recent changes from to do list; still have to do figshare stuff