a lot of stuff updated