fixed more dependencies and scope.