updated loads of stuff