More bug fixes, further VCF extension.