updated scm section and minor refactorings