fix things before the demo