consistency; documents; noted TODOs
auto-merge staging into master