updated templates
updated templates
checking in bug fixes