Update REFERENCE and TODOs