Reworked & expanded both tables. Still needs polishing.