Fixed what was wrong, with everything!