Minor modifications and fixes on each file.