Merge pull request #433 from dubslow/master

fix #431, fix export cancels, and more debug prints
fix #436