Final changes before demo and submission.