pretty sure i finished fiing everything