Updated Reset

And some other stuff