Changing address + a few adjustments