extended OVA and other bugfixes