- updated BRs, noted some TODOs