VE update with some bugs fixed