Revised file location for data source.  Fixed a couple bugs, added comments and removed unneeded files.