A few adjustments and TODOs