Added some stuff to make logging better for #2