Fixed it all, even more!