Improved address processing logic and more