Add origin and fix other errors