Don't disable looping (meh)
Correctly clear CER
Add user-class option in help text and minor clean up