More comments added and names of files changed