new relations throughout classes and a few minor changes