added a working prefereces table
had to fix some merge errors