Changed the api code: removed all the functions that did a slightly different thing. put them into 1 function that has several options. Moreover, cleaned up code, test functions, and other functions throughout code