minor changes, still not reliably able to cope with shader changes and VAO