Add additional changes from other forks. Make log outputs more legible