Cleanup pyflakes;
Improve traget dialog;