partial adjust: resolved TODOs