Addressed some TODOs