improved a lot of things