Fix address number padding issues, ref #85
Case for "F D R" naming, ref #58