Minor updates to calculate_tables.py