demo file bugfixes.