More changes to Raspberry Rain demo;  add a commented out optimization to Shape