Adding section comments
Added defines for values