Bugfix on virtuals options, minor code formatting/cleanup