Fixed Model relations

- Squashed some bugs