tunings for demo + bugfix