added useful TODO comments