added vcsrepo and fix bugs / typos
resolving conflicts