Update template with bug fixes and NLS file updates.