Adds the missing extraByte handling.
Modifies padding to work properly.