Made final changes prepping for prod