tweaks

normalise some assumptions, and use the sig of the context for the tysig
as well as the tmsig