Small fixes to parser
Added more potential line breaks
Universe comparisons must ignore locations!