Added billing address. Some minor fixes.