FIXED EVERYTHING HAHAH