new templates, minor controller changes