Fixed singles, adjusted reset, cleaning up