demo updates and bug fixes.