solved api bugs