Some updates needed to get running and a little better debug output.