Fixed VBR parsing (i think)

currently have to toggle between MBR and VBR parsing by commenting each
function out to test for each