Got rid of some debug stuff and tidied displacement sampling.