small improvements + shared run.py