extract address methods and small improvements