fixes #1382
#1952: Update tests
#1382: cleanup
Potential fix for #1545
fixes #2000
#1984: Fix script
fixes #1982
fixes #2001
fixes #1989
remove debug logging
new version
Merge branch 'master' into omnibooru