I think I got it all fixed....give it a test and lemme know!