Final changes, updated README.
More  code cleanup.  Hope to cleanup more later.