Various changes, mostly resetting things