Updated and fixed settings.
Removed accidentally committed comment-outs of debug statement.s