deleted preferences, fixed franklyn's merging conflicts bugs
pulling