Assorted additions (TODOs) and a few typo fixes.