Fixed some comments
Merged