couple of signature parameter fixes
various tweaks