Fix whitespace inconsistency; Add convenience relationships to track
Update specs