added expand and expandNormalized
improved Signature parsing