Cleaned up extra relationship values, minor changes to prevent crashing.