Correction on configuration and addition of TODO's