Version 1.6

Expand 2 tables.

Fix bugs.