This gets us better log messages and better spacing - but it's far from good and all of this should be squashed into one working version in the end. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>