some corrections...preparing to merge some files.