rewriting some options
code cleanup; added class 5, 5a, and 6