Param interpolation

I've fixed some bugs on the branch. Explanations are in the commits messages.