Solved more bugs in vacuum moving