more bug fixes
for demo