Added comments on what is left to finish