Signal Modifier changes

A few things, to make it properly I will need to change a few files, am
waiting until there are less things to merge to setup.