trivial changes
more cosmetic changes
dont need to convert parameters manually
works up until model.py
working on results generation