Minor deploy improvements
Add ToC
merge upstream