cleaned code a bit, added a few comments to settings activity
cleaned code, last commit for today...