More model tweaks on Period and InventoryState models