consistency; documents; noted TODOs