Modifications, code changes, refactoring of common methods.  Cleaned up naming, added pudge test demo file.