Few changes
Fixed comments
Forgot to generate id in comments