Reorganized the DB and fixed the resulting errors.  I think this makes things a little cleaner.