Feature1: reviewed some files

please check...