Started work on template inheritance. Fixed some more links.