Fixed some minor stpl bugs and improved documentation.
Fixed name of base-template content variable to match documentation...