Various changes to get reading accounts from file working.