Further style tweaks.
Some TODOs.