add some fixes
add ordering