update to lots of stuff