Donna Morgan bug fix and logging