fixes to improve demos a bit