some functions fixed, reposiory changed