Commented settings section and added TODO