added some new entities, fixed the FK mappings on a few tables