updating with the latest revisions...working on logger, etc.