code cleanup
add api-extentions
added api android