Added comments indicating needed improvements