Many updates and fix /0 (if not exist swap)