Minecraft/src/main/java/com/microsoft/Malmo/Client/VideoHook.java (5 lines):
	- line 375: // TODO Auto-generated catch block
	- line 380: // TODO Auto-generated catch block
	- line 385: // TODO Auto-generated catch block
	- line 390: // TODO Auto-generated catch block
	- line 395: // TODO Auto-generated catch block


Minecraft/src/main/java/com/microsoft/Malmo/Server/ServerStateMachine.java (4 lines):
	- line 483: // TODO: What now?
	- line 515: // TODO: What?
	- line 930: // TODO - is this worth aborting the mission for?
	- line 1273: //TODO - tidy up.


Minecraft/src/main/java/com/microsoft/Malmo/MissionHandlers/ClassroomDecoratorImplementation.java (2 lines):
	- line 212: // TODO - for the moment, force all players to being at the maze start point - but this needs to be optional.
	- line 465: // TODO not entirely clear why reshuffling each time causes failure


Minecraft/src/main/java/com/microsoft/Malmo/Client/ClientStateMachine.java (2 lines):
	- line 807: // TODO What to do here?
	- line 1285: // TODO MalmoEnvServer <- Running


Minecraft/src/main/java/com/microsoft/Malmo/MissionHandlers/MissionBehaviour.java (2 lines):
	- line 65: // TODO - can't throw and return a behaviour!!
	- line 76: // TODO - can't throw and return a behaviour!!


Minecraft/src/main/java/com/microsoft/Malmo/MissionHandlers/MazeDecoratorImplementation.java (2 lines):
	- line 626: // TODO: how do we set the goal position, now it no longer has a declaration in the Mission xml?
	- line 635: // TODO - for the moment, force all players to being at the maze start point - but this needs to be optional.


Minecraft/src/main/java/com/microsoft/Malmo/Utils/TCPUtils.java (2 lines):
	- line 95: // TODO Auto-generated catch block
	- line 100: // TODO Auto-generated catch block


Minecraft/src/main/java/com/microsoft/Malmo/MissionHandlers/CommandForKey.java (2 lines):
	- line 359: // TODO Auto-generated catch block
	- line 364: // TODO Auto-generated catch block


Malmo/src/TCPServer.cpp (1 line):
	- line 54: const int port_max = 11000; // TODO: could be configurable


Minecraft/src/main/java/com/microsoft/Malmo/Utils/JSONWorldDataHelper.java (1 line):
	- line 108: ); // TODO: there are many other ways of moving!


MalmoEnv/malmoenv/bootstrap.py (1 line):
	- line 30: branch: optional branch to clone. TODO Default is release version.


Malmo/src/AgentHost.cpp (1 line):
	- line 308: // TODO - currently reserved for 20 seconds (the 20000 below) - make this configurable.


Minecraft/src/main/java/com/microsoft/Malmo/EpisodeEventWrapper.java (1 line):
	- line 150: //TODO - should we make sure this config change is acted on?


Minecraft/src/main/java/com/microsoft/Malmo/Utils/MinecraftTypeHelper.java (1 line):
	- line 210: // TODO - can we do something more clever... eg make StoneTypes, WoodTypes etc inherit from an XSD baseclass,


Minecraft/src/main/java/com/microsoft/Malmo/Utils/TCPInputPoller.java (1 line):
	- line 337: // TODO Auto-generated catch block


Minecraft/src/main/java/com/microsoft/Malmo/MissionHandlers/DiscreteMovementCommandsImplementation.java (1 line):
	- line 507: // TODO - proper error reporting.


Minecraft/src/main/java/com/microsoft/Malmo/Client/MalmoEnvServer.java (1 line):
	- line 623: String status = "{}"; // TODO Possibly have something more interesting to report.