berry: add couple of TODOs