-bug fixes
-correct handler is now used for dry runs