corrected configs and TODO