normalized after Arnaud's changes
looks like the way we store signatures is little bit different, hence the numerous changes, but in fact only a few are affected