Simpler tables and a few corrections.