Main.py and Run.py - some minor changes. Tested with archiver.