changed template engine to ECT, small fixes