added some more apis
cleanup
cleanup
merge
merge