Made some fixes before final submission.