Some TODOs and comments