updated a load of stuff