some changes to the displacement system, and a few other things