clean up TODOs, other tweaks, add reference