Add ordering,clean up, some small doc