Added vApp, various fixes and leftovers from refactoring.