Add the letter templates, make small fixes to code

Change-Id: I055978fd6331c22cf0af5ae66b95ec15099b28e9