Working.  Moved data to working directory to ease testing.
Code fixes and updates.