Fixes to addressing, new Address class, rationalisation