more logging and mortal refactoring