Fix sorting, more section work + specs