Added and fixed comments