Modifications to make Krawczyk 1D work

This is what we discussed today.