Finish fixing up demo