Finish demo and fix defects