updated repo and minor fixes