Clarifying instructions
Add user capability and appropriate checking
Fixing function comment