missed templates added also some minor fixes