Some good changes from git