Tiny mods to 2D sim, deleted some ResearchNotes stuff now that it is all on DropBox