templates change, some fixes