update a lot of stuff, still not done