start of composition sorting
small unrelated bugfix
onsave sort working
Merge branch 'CompositionSorting'