Some improvements around Lampy's movement.