Add more logging (this is still in alpha)