atox() fix to solve padding mismatch

Also reverted hex change to not drop leading zeros off in
addHexField(), so everything should work correctly now
Merge branch 'testing'