signal mapper
removed some more commented signals