Fix empty space skipping, add smooth movements