seriously improved the Content Template mechanism