Some Minor TODO fixes#2

adamnew123456 wants to merge 3 commits intomil:mastermil/foo-wm:masterfrom

adamnew123456:todo-changesadamnew123456/foo-wm:todo-changesCopy head branch name to clipboard