Added and fixed some comments