Second Commit changed small things.

Moved logger.