change some TODO items into issues