Updates fixing problems, setting origin