Adds latest changes after Lab 2A's submission.