Issue 5852 (casper) Code clean up, adding documentation on new switches. Thanks!