Re-instate multi line addresses

Also add some aliases in to fix the spelling mistake while keeping
backward compatability