Adding some adjustment and a few TODOs.