corrected and left TODO notes
fixed merge conflict