added ability to easily turn off live API calls
removed more rubbish