add tables and fix formats.