Continue to improve comments
Fully implement comments