fixing issues with credentials; needs actual testing