Misc updates
URI Templating (reverse-engineering)