Several updates; added new taxonomy template