slightly stricter address encoding
function renaming