Add some new exercise, modify sort