fixed around some of the code, prefixes and tests; fixed demos