Naming changes, adjustments
User limitation removed, set points method added, tests