Incorporate adam tweaks to user adds gem

Incorporated Adam's suggestions