adding more options and organizing switch
Merge pull request #7 from autochthonexalt/New-options

adding more options and organizing switch