Fixed pathing issue.  Did some code cleanup and README updating.