commit to merge
update APIs and fix is_my_account
rename stuff to reflect api