Feature/47 hhaccount conversion

Fixes for HHAccount Convertor.  Should fix remaining outstanding issues: #743 and #745