add/sub carry was still wrong