More fixes. Still not sure what to do with vertices output...