Version 2

Quick bugfix and log format changes.