General comment cleanup, Added TODOs