Refactor VBOs a little bit, bring primitives up to speed