Updates to tables, other minor updates

Version 2.3.2