Hot fixes

[minavu]

I fixed a few things and tried to clean up run.py a bit. I also cleaned up some constructor parameters so that it would look cleaner in run.py.