Add JUNKFILE and 2 more TODO items.