Fixed Everything and more!