fixed validation and added more details to templates