fix issues - APIv1 is working now