Cleaned up vizunt call logic

And probably introduced a few bugs in the process.