Pull input changes from Henrik Rydberg, including large update to