add backtrace to error logging
remove debug info
add mporam changes
Merge branch 'hannahg' into mporam