Made some nice updates