Added some ranking
Flush handler fix, some hand tests