Switched over to live api, fixed initial loading bug