Some basic comment changes
Improved doc