lots of adjustments, conditional VAO (not available on Raspi), now running on Raspi