demo fixes
comments