Fixed some relationships. Made it easier.