Bug correction  on parameters and modulation computation
Merge branch 'diadems' of https://github.com/yomguy/TimeSide into diadems