started fixing up demo