fixed relationship manager, minor fixes