Finish TODOs and some tweaks.