Additional template upates and corrections