Fixed (hopefully) the interface for encryption datapath.
More interface fixes.
Changed name for round number ouput.