polished up the apis to make sure they arent throwing any errors