Fixes in main file
Fix pyPEPA