added some useful TODO comments