+ConfigFile.py and some other minor changes