Added "of" argument to .list
Changes to make use of it.
Some commenting.