fixed errors and merged new version of scmp