sort entities, more options, cleanup
1.0.0