Overhaul of periods and filing tables to try to address #83