Renamed class methods that actually are relation methods in the code.
Fixed some small bugs.