cleaned up setup function and fixed ppaGit