Updated vivify. Fixed some other stuff too.