Fixes to 7.1

Now works with numbers and names, added some comments