Add time limit to 2 minutes. Other minor changes.