resolve TODO items concerning units