formatting and add missing table