minor changes to CurrentAddress