Change scope configuration files to make master scope fully workable
Code cleanup and small changes
Modify README.md