diff --git a/client/src/components/AddCourseModal.tsx b/client/src/components/AddCourseModal.tsx
index 7c4eded..b4d82ad 100755
--- a/client/src/components/AddCourseModal.tsx
+++ b/client/src/components/AddCourseModal.tsx
@@ -51,6 +51,12 @@ const AddCourseModal: React.FC<AddCourseModalProps> = ({ onClose, refreshData })
     };
   }, []);
 
+  useEffect(() => {
+    if (activeTab === "text" && currentStep === 3) {
+      setCurrentStep(2);
+    }
+  }, [activeTab, currentStep]);
+
   useEffect(() => {
     let isCancelled = false;
 
@@ -190,6 +196,11 @@ const AddCourseModal: React.FC<AddCourseModalProps> = ({ onClose, refreshData })
       return;
     }
 
+    if (activeTab === "text") {
+      handleSubmit();
+      return;
+    }
+
     setSubmitError("");
     setCurrentStep(3);
   };
@@ -205,8 +216,13 @@ const AddCourseModal: React.FC<AddCourseModalProps> = ({ onClose, refreshData })
       return;
     }
 
-    if (!goalValue.trim()) {
-      setSubmitError("Please add what you want to achieve from this roadmap.");
+    const userGoalPayload = activeTab === "text" ? textValue.trim() : goalValue.trim();
+    if (!userGoalPayload) {
+      setSubmitError(
+        activeTab === "text"
+          ? "Please enter your topic description."
+          : "Please add what you want to achieve from this roadmap."
+      );
       return;
     }
 
@@ -227,7 +243,7 @@ const AddCourseModal: React.FC<AddCourseModalProps> = ({ onClose, refreshData })
     }
 
     payload.append("time_query", durationValue.trim());
-    payload.append("user_goal", goalValue.trim());
+    payload.append("user_goal", userGoalPayload);
 
     setIsSubmitting(true);
     setSubmitError("");
@@ -297,24 +313,26 @@ const AddCourseModal: React.FC<AddCourseModalProps> = ({ onClose, refreshData })
               >
                 Duration
               </button>
-              <button
-                onClick={() => {
-                  if (hasSourceInput() && durationValue.trim()) {
-                    setSubmitError("");
-                    setCurrentStep(3);
-                  }
-                }}
-                className={`pb-2 text-sm uppercase tracking-widest transition-all ${
-                  currentStep === 3
-                    ? "text-white border-b border-white"
-                    : "text-text-secondary border-b border-transparent hover:text-white"
-                }`}
-              >
-                Goal
-              </button>
+              {activeTab !== "text" && (
+                <button
+                  onClick={() => {
+                    if (hasSourceInput() && durationValue.trim()) {
+                      setSubmitError("");
+                      setCurrentStep(3);
+                    }
+                  }}
+                  className={`pb-2 text-sm uppercase tracking-widest transition-all ${
+                    currentStep === 3
+                      ? "text-white border-b border-white"
+                      : "text-text-secondary border-b border-transparent hover:text-white"
+                  }`}
+                >
+                  Goal
+                </button>
+              )}
             </div>
             <span className="text-xs uppercase tracking-[0.3em] text-text-secondary">
-              Step {currentStep} of 3
+              Step {currentStep} of {activeTab === "text" ? 2 : 3}
             </span>
           </div>
 
@@ -559,7 +577,7 @@ const AddCourseModal: React.FC<AddCourseModalProps> = ({ onClose, refreshData })
           >
             {currentStep === 1 ? "Cancel" : "Back"}
           </button>
-          {currentStep === 3 ? (
+          {currentStep === (activeTab === "text" ? 2 : 3) ? (
             <button
               onClick={handleSubmit}
               disabled={isSubmitting}
diff --git a/client/src/components/QuizModal.tsx b/client/src/components/QuizModal.tsx
index d50b8c1..35fd43c 100755
--- a/client/src/components/QuizModal.tsx
+++ b/client/src/components/QuizModal.tsx
@@ -26,6 +26,38 @@ type QuizModalProps = {
 
 type QuizState = "settings" | "taking" | "results";
 
+export const checkAnswer = (question: QuizQuestion, userAnswer: string): boolean => {
+  if (!userAnswer || !question || !question.answer) return false;
+  
+  const normUser = userAnswer.trim().toUpperCase();
+  const normCorrect = question.answer.trim().toUpperCase();
+  
+  if (normUser === normCorrect) return true;
+  
+  // If the correct answer is the full option text, check if the user selected that option
+  const userIndex = normUser.charCodeAt(0) - 65;
+  const userOptionText = question.options[userIndex];
+  if (userOptionText && userOptionText.trim().toUpperCase() === question.answer.trim().toUpperCase()) {
+    return true;
+  }
+  
+  // If the correct answer is in the format "A) Text" or "A. Text"
+  if (normCorrect.startsWith(normUser) && (normCorrect.length === 1 || normCorrect[1] === ')' || normCorrect[1] === '.')) {
+    return true;
+  }
+  
+  // Find if correct answer matches any option text, and see if the user selected that option's letter
+  const correctOptionIdx = question.options.findIndex(
+    (opt) => opt.trim().toUpperCase() === question.answer.trim().toUpperCase()
+  );
+  if (correctOptionIdx !== -1) {
+    const correctLetter = String.fromCharCode(65 + correctOptionIdx);
+    if (normUser === correctLetter) return true;
+  }
+  
+  return false;
+};
+
 const QuizModal: React.FC<QuizModalProps> = ({
   isOpen,
   onClose,
@@ -45,20 +77,16 @@ const QuizModal: React.FC<QuizModalProps> = ({
   const [quizState, setQuizState] = useState<QuizState>("settings");
   const [userAnswers, setUserAnswers] = useState<Record<number, string>>({});
   const [isSavingQuiz, setIsSavingQuiz] = useState(false);
-  const [generationInitiated, setGenerationInitiated] = useState(false);
+  const [isWaitingForQuiz, setIsWaitingForQuiz] = useState(false);
 
   useEffect(() => {
     if (!isOpen) {
       setQuizState("settings");
       setUserAnswers({});
-      setGenerationInitiated(false);
+      setIsWaitingForQuiz(false);
       return;
     }
 
-    if (isLoading) {
-      setGenerationInitiated(true);
-    }
-
     const tl = gsap.timeline({ defaults: { ease: "power3.out" } });
     tl.fromTo(overlayRef.current, { opacity: 0 }, { opacity: 1, duration: 0.25 }).fromTo(
       modalRef.current,
@@ -70,7 +98,7 @@ const QuizModal: React.FC<QuizModalProps> = ({
     return () => {
       tl.kill();
     };
-  }, [isOpen, isLoading]);
+  }, [isOpen]);
 
   useEffect(() => {
     if (!isOpen) {
@@ -89,19 +117,26 @@ const QuizModal: React.FC<QuizModalProps> = ({
   }, [isOpen]);
 
   const handleGenerateAndStart = () => {
-    setGenerationInitiated(true);
+    setIsWaitingForQuiz(true);
     onGenerateQuiz();
   };
 
   useEffect(() => {
-    if (generationInitiated && !isLoading) {
-      if (questions.length > 0 && quizState === "settings") {
+    if (!isOpen) {
+      setIsWaitingForQuiz(false);
+      return;
+    }
+
+    if (isLoading) {
+      setIsWaitingForQuiz(true);
+    } else if (isWaitingForQuiz && questions.length > 0) {
+      if (quizState === "settings") {
         setQuizState("taking");
         setUserAnswers({});
       }
-      setGenerationInitiated(false);
+      setIsWaitingForQuiz(false);
     }
-  }, [isLoading, questions, quizState, generationInitiated]);
+  }, [isOpen, isLoading, questions, isWaitingForQuiz, quizState]);
 
   const handleAnswerSelect = (questionIndex: number, selectedOption: string) => {
     setUserAnswers((prev) => ({
@@ -119,7 +154,10 @@ const QuizModal: React.FC<QuizModalProps> = ({
     setIsSavingQuiz(true);
     try {
       const correctCount = Object.entries(userAnswers).filter(
-        ([index, answer]) => questions[Number(index)]?.answer === answer,
+        ([index, answer]) => {
+          const q = questions[Number(index)];
+          return q && checkAnswer(q, answer);
+        },
       ).length;
 
       await submitQuiz({
@@ -148,7 +186,10 @@ const QuizModal: React.FC<QuizModalProps> = ({
   const score = useMemo(() => {
     if (questions.length === 0) return 0;
     const correct = Object.entries(userAnswers).filter(
-      ([index, answer]) => questions[Number(index)]?.answer === answer,
+      ([index, answer]) => {
+        const q = questions[Number(index)];
+        return q && checkAnswer(q, answer);
+      },
     ).length;
     return Math.round((correct / questions.length) * 100);
   }, [userAnswers, questions]);
@@ -266,8 +307,10 @@ const QuizModal: React.FC<QuizModalProps> = ({
         <p className="font-sans text-xs uppercase tracking-[0.3em] text-[#d8bf92]">Your Score</p>
         <p className="mt-4 text-5xl font-serif text-white">{score}%</p>
         <p className="mt-2 font-sans text-sm text-text-secondary">
-          {Object.entries(userAnswers).filter(([index, answer]) => questions[Number(index)]?.answer === answer)
-            .length}{" "}
+          {Object.entries(userAnswers).filter(([index, answer]) => {
+            const q = questions[Number(index)];
+            return q && checkAnswer(q, answer);
+          }).length}{" "}
           out of {questions.length} correct
         </p>
       </div>
@@ -275,7 +318,7 @@ const QuizModal: React.FC<QuizModalProps> = ({
       <div className="space-y-3">
         {questions.map((item, index) => {
           const userAnswer = userAnswers[index];
-          const isCorrect = userAnswer === item.answer;
+          const isCorrect = userAnswer ? checkAnswer(item, userAnswer) : false;
           return (
             <article
               key={`result-${index}`}
diff --git a/client/src/pages/Login.tsx b/client/src/pages/Login.tsx
index d4eb06f..68d7174 100755
--- a/client/src/pages/Login.tsx
+++ b/client/src/pages/Login.tsx
@@ -4,13 +4,14 @@ import Navigation from "../components/Navigation";
 import OAuthButton from "../components/OAuthButton";
 import gsap from "gsap";
 import { Link, useNavigate } from "react-router-dom";
-import { login, startOAuthLogin } from "../apis/authApi";
+import { useAuth } from "../context/AuthContext";
 
 const Login: React.FC = () => {
   const containerRef = useRef<HTMLDivElement>(null);
   const formRef = useRef<HTMLFormElement>(null);
   const titleRef = useRef<HTMLHeadingElement>(null);
   const navigate = useNavigate();
+  const { login, startOAuthLogin } = useAuth();
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
   const [errorMessage, setErrorMessage] = useState("");
@@ -28,24 +29,17 @@ const Login: React.FC = () => {
     setIsSubmitting(true);
 
     try {
-      const response = await login({
+      const user = await login({
         email,
         password,
       });
 
-      const data = response.data as {
-        success?: boolean;
-        token?: string;
-        user?: unknown;
-        message?: string;
-      };
-
-      if (data?.token || data?.user || data?.success) {
+      if (user) {
         navigate("/dashboard");
         return;
       }
 
-      setStatusMessage(data?.message ?? "Login request completed.");
+      setStatusMessage("Login request completed.");
     } catch {
       setErrorMessage("Login failed. Please try again.");
     } finally {
diff --git a/client/src/pages/Signup.tsx b/client/src/pages/Signup.tsx
index 5419768..de9f8fd 100755
--- a/client/src/pages/Signup.tsx
+++ b/client/src/pages/Signup.tsx
@@ -4,13 +4,14 @@ import Navigation from "../components/Navigation";
 import OAuthButton from "../components/OAuthButton";
 import gsap from "gsap";
 import { Link, useNavigate } from "react-router-dom";
-import { register, startOAuthLogin } from "../apis/authApi";
+import { useAuth } from "../context/AuthContext";
 
 const Signup: React.FC = () => {
   const containerRef = useRef<HTMLDivElement>(null);
   const formRef = useRef<HTMLFormElement>(null);
   const titleRef = useRef<HTMLHeadingElement>(null);
   const navigate = useNavigate();
+  const { register, startOAuthLogin } = useAuth();
   const [fullName, setFullName] = useState("");
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
@@ -32,26 +33,19 @@ const Signup: React.FC = () => {
     const lastName = rest.join(" ");
 
     try {
-      const response = await register({
+      const user = await register({
         firstName: firstName ?? "",
         lastName,
         email,
         password,
       });
 
-      const data = response.data as {
-        success?: boolean;
-        token?: string;
-        user?: unknown;
-        message?: string;
-      };
-
-      if (data?.token || data?.user || data?.success) {
+      if (user) {
         navigate("/dashboard");
         return;
       }
 
-      setStatusMessage(data?.message ?? "Signup request completed.");
+      setStatusMessage("Signup request completed.");
     } catch {
       setErrorMessage("Signup failed. Please try again.");
     } finally {
diff --git a/client/src/service/baseUrl.ts b/client/src/service/baseUrl.ts
index d55f5ef..b8f6006 100755
--- a/client/src/service/baseUrl.ts
+++ b/client/src/service/baseUrl.ts
@@ -1,7 +1,13 @@
 import axios from "axios";
 
 const normalizedBaseUrl = (
-  import.meta.env.VITE_API_BASE_URL ?? "https://curriculumos.onrender.com/api"
+  import.meta.env.VITE_API_BASE_URL ??
+  (typeof window !== "undefined" &&
+  (window.location.hostname === "localhost" ||
+    window.location.hostname === "127.0.0.1" ||
+    window.location.hostname === "0.0.0.0")
+    ? "/api"
+    : "https://curriculumos.onrender.com/api")
 ).replace(/\/$/, "");
 
 export const apiBaseUrl = normalizedBaseUrl;
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 6bd8a17..b510a6a 100755
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -13,5 +13,12 @@ export default defineConfig({
   server:{
     host:'127.0.0.1',
     port:5173,
+    proxy: {
+      '/api': {
+        target: 'http://localhost:8080',
+        changeOrigin: true,
+        secure: false,
+      }
+    }
   }
 })
diff --git a/python/app/rag/loaders/youtube.py b/python/app/rag/loaders/youtube.py
index dfd8987..004c665 100755
--- a/python/app/rag/loaders/youtube.py
+++ b/python/app/rag/loaders/youtube.py
@@ -25,7 +25,8 @@ def load_youtube_video(url: str) -> list[Document]:
     if proxy_username and proxy_password:
         proxy_config = WebshareProxyConfig(
             proxy_username=proxy_username,
-            proxy_password=proxy_password
+            proxy_password=proxy_password,
+            filter_ip_locations=["jp"]
         )
         api = YouTubeTranscriptApi(proxy_config=proxy_config)
     else:
diff --git a/python/requirements.txt b/python/requirements.txt
index 7547fc5..170d20b 100755
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -3,14 +3,14 @@ uvicorn==0.35.0
 python-multipart==0.0.20
 python-dotenv==1.1.1
 
-langchain==1.0.0
-langchain-core==1.0.0
-langchain-community==0.4
-langchain-chroma==1.0.0
-langchain-groq==1.0.0
-chromadb==1.0.20
-groq==0.31.0
-fastembed==0.4.2
+langchain>=0.3.0
+langchain-core>=0.3.0
+langchain-community>=0.3.0
+langchain-chroma>=0.1.0
+langchain-groq>=0.3.0
+chromadb>=0.5.0
+groq>=0.31.0
+fastembed>=0.5.0
 
 numpy==2.3.2
 
diff --git a/server/cmd/server/main.go b/server/cmd/server/main.go
index d5a0549..8b5e802 100755
--- a/server/cmd/server/main.go
+++ b/server/cmd/server/main.go
@@ -35,6 +35,7 @@ func main() {
 		cfg.CLIENT_URL,
 		cfg.PYTHON_URL,
 		"http://localhost:5173",
+		"http://127.0.0.1:5173",
 	}
 	corsHandler := cors.New(cors.Options{
 		AllowedOrigins: allowedOrigins,
diff --git a/server/db/initDB.go b/server/db/initDB.go
index 28239ea..4ad0458 100755
--- a/server/db/initDB.go
+++ b/server/db/initDB.go
@@ -15,31 +15,37 @@ func InitDB(cfg *config.Config) (*gorm.DB, error) {
 	log.Println("Initializing database...")
 	database_url := cfg.DATABASE_URL
 
-	// Render deployments frequently sit behind pgBouncer. Using the simple protocol and
-	// disabling prepared statement caching avoids "prepared statement name is already in use" (08P01).
-	db, err := gorm.Open(
-		postgres.New(postgres.Config{
-			DSN:                  database_url,
-			PreferSimpleProtocol: true,
-		}),
-		&gorm.Config{
-			PrepareStmt: false,
-			Logger: logger.New(
-				log.New(os.Stdout, "\r\n", log.LstdFlags),
-				logger.Config{
-					SlowThreshold:             200 * time.Millisecond,
-					LogLevel:                  logger.Warn,
-					IgnoreRecordNotFoundError: true,
-					Colorful:                  false,
-				},
-			),
-		},
-	)
-	if err != nil {
-		log.Print("Failed to connect to database:", err)
-		return nil, err
+	var db *gorm.DB
+	var err error
+
+	for i := 1; i <= 10; i++ {
+		log.Printf("Connecting to database (attempt %d/10)...", i)
+		db, err = gorm.Open(
+			postgres.New(postgres.Config{
+				DSN:                  database_url,
+				PreferSimpleProtocol: true,
+			}),
+			&gorm.Config{
+				PrepareStmt: false,
+				Logger: logger.New(
+					log.New(os.Stdout, "\r\n", log.LstdFlags),
+					logger.Config{
+						SlowThreshold:             200 * time.Millisecond,
+						LogLevel:                  logger.Warn,
+						IgnoreRecordNotFoundError: true,
+						Colorful:                  false,
+					},
+				),
+			},
+		)
+		if err == nil {
+			log.Println("Successfully connected to database!")
+			return db, nil
+		}
+		log.Printf("Failed to connect to database (attempt %d/10): %v", i, err)
+		time.Sleep(2 * time.Second)
 	}
 
-	return db, nil
+	return nil, err
 
 }
diff --git a/server/db/models/userModel.go b/server/db/models/userModel.go
index 3329857..dc19518 100755
--- a/server/db/models/userModel.go
+++ b/server/db/models/userModel.go
@@ -4,11 +4,11 @@ type User struct {
 	ID                  uint      `gorm:"primaryKey;autoIncrement"`
 	FirstName           string    `json:"firstName"`
 	LastName            string    `json:"lastName"`
-	Email               string    `gorm:"index" json:"email"`
+	Email               string    `gorm:"index;unique" json:"email"`
 	Password            string    `json:"-"`
-	ProviderAccountID   string    `gorm:"index:idx_provider_account,unique" json:"providerAccountId"`
+	ProviderAccountID   *string   `gorm:"index;unique" json:"providerAccountId"`
 	OAUTH_access_token  string    `json:"-"`
 	OAUTH_refresh_token string    `json:"-"`
-	AuthProvider        string    `gorm:"index:idx_provider_account,unique" json:"authProvider"`
+	AuthProvider        string    `json:"authProvider"`
 	Roadmaps            []Roadmap `gorm:"foreignKey:AuthorID;constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"`
 }
diff --git a/server/docker-compose.dev.yml b/server/docker-compose.dev.yml
index 379f7da..36a76a3 100644
--- a/server/docker-compose.dev.yml
+++ b/server/docker-compose.dev.yml
@@ -12,9 +12,14 @@ services:
 
     environment:
       DATABASE_URL: postgresql://myuser:mypassword@postgres:5432/mydatabase
+      PYTHON_URL: http://python_service:8000
 
     depends_on:
       - postgres
+      - python_service
+
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
     restart: unless-stopped
 
@@ -24,7 +29,7 @@ services:
 
   postgres:
     image: postgres:17-alpine
-    container_name: postgres_db
+    container_name: cur_dev_db
 
     environment:
       POSTGRES_USER: myuser
@@ -43,6 +48,30 @@ services:
       - app_network
 
 
+  python_service:
+    build:
+      context: ../python
+      dockerfile: Dockerfile.prod
+    container_name: python_service
+
+    ports:
+      - "8000:8000"
+
+    env_file:
+      - ../python/app/.env
+
+    environment:
+      - DATABASE_URL=postgresql://myuser:mypassword@postgres:5432/mydatabase
+
+    depends_on:
+      - postgres
+
+    restart: unless-stopped
+
+    networks:
+      - app_network
+
+
 volumes:
   postgres_data:
 
diff --git a/server/internal/services/authService.go b/server/internal/services/authService.go
index 8d70696..be6ee73 100755
--- a/server/internal/services/authService.go
+++ b/server/internal/services/authService.go
@@ -112,7 +112,7 @@ func UpsertOAuthUser(db *gorm.DB, profile OAuthUserProfile) (*models.User, error
 	user.FirstName = firstNonEmpty(profile.FirstName, user.FirstName)
 	user.LastName = firstNonEmpty(profile.LastName, user.LastName)
 	user.Email = firstNonEmpty(profile.Email, user.Email)
-	user.ProviderAccountID = profile.ProviderUserID
+	user.ProviderAccountID = &profile.ProviderUserID
 	user.AuthProvider = profile.Provider
 	user.OAUTH_access_token = profile.AccessToken
 	user.OAUTH_refresh_token = profile.RefreshToken