Updated user references
Small revisions