Fixed the rest of the basic connections between classes.