Fix a few typos, add a few TODOs.