Incoroprate a bunch of comments from Asbjorn Tonnesen