cleanup, rename, minor bugfixes on demo components