Revert "Revert "edited some files and comments added""

This reverts commit 65dda01a65a5cf563a6b30de60d150edb623fc75.