Fixed loads of things!!