Update some TODOs and clarify some topics