Fix alignment, reorder properties and fix firstaired parsing