Fixes so reset is awesome