Fixing loads o stuffs! Big props to clever :)