new templates and small changes