minor edit, adding TODO comments for later