Further edits

almost done with relations