Implemented waterfall parameters as vectors.

Bugfixes for XS spread
Closes #128
Closes #133