Fixed the annotations and relationships. Specifically on detaching 
objects where needed.