Fixes

Hi Christi,

There were a few problems in the code for the new files.  I fixed them in this branch, and pushed it to github.  You can review and accept these changes, rather than copy them yourself, by pressing the green "Merge" button, and then pulling origin from any local installation.

Also notice, this pull request is into your master branch "cerba/topref", rather than my master branch "betchart/topref".

Good job getting those files all moved.

Burt