Fixes.
Moar fixes. Address encoding seems to be working.