Lots of comments and fixed the nullpointerexception in the settings activity.