Few nitpick changes and a fix for cookie injection of script tags.