some error correction and some template hidden
added new lines