Documentation: fill in the last TODO sections