Corrections

Missed removing under score in settings
Merge pull request #97 from otherWIP/testing

Renaming corrections