updated a lot of things