a couple of movement type improvements