First commit
Bugfixes, parametrization and more