Tons of improvements to the extension