Config improvements & comments