made some corrections to the code.
merging files