cleanup, prefixes, demo improvements