diff --git a/src/components/ListItem.jsx b/src/components/ListItem.jsx
index ebf7d11..1b7334e 100644
--- a/src/components/ListItem.jsx
+++ b/src/components/ListItem.jsx
@@ -13,7 +13,7 @@ export function ListItem({ name, listPath, id, isChecked, datePurchased }) {
 
 	useEffect(() => {
 		const today = new Date().getTime();
-		const datePurchasedInMillis = datePurchased.toMillis();
+		const datePurchasedInMillis = datePurchased?.toMillis();
 
 		if (isChecked && today - datePurchasedInMillis >= ONE_DAY_IN_MILLISECONDS) {
 			updateItem(listPath, id, !isChecked);
diff --git a/src/components/ManageListForms/AddItemForm.jsx b/src/components/ManageListForms/AddItemForm.jsx
index 763d0cb..7c31430 100644
--- a/src/components/ManageListForms/AddItemForm.jsx
+++ b/src/components/ManageListForms/AddItemForm.jsx
@@ -1,15 +1,25 @@
 import { useState } from 'react';
 import { addItem } from '../../api/firebase';
 
-export default function AddItemForm({ listPath }) {
+export default function AddItemForm({ listPath, data }) {
 	const [formData, setFormData] = useState({
 		itemName: '',
 		daysUntilNextPurchase: '',
 	});
 
 	const handleSubmit = async (event) => {
+		event.preventDefault();
 		try {
-			event.preventDefault();
+			console.log(formData.itemName);
+			const submittedItem = formData.itemName
+				.toLowerCase()
+				.replace(/[.,/#!$%^&*;:{}=\-_`~()\s]/g, '')
+				.replace(/[^\w\s]/gi, '');
+			setFormData((prevData) => ({
+				...prevData,
+				itemName: submittedItem,
+			}));
+			console.log('after set form data,', submittedItem);
 			await addItem(listPath, formData);
 			alert(`${formData.itemName} was added to the list successfully`);
 		} catch (error) {