add todo
add todo
add order_by and fix a couple bugs
bump version