second table small fixes
complete second table (without validation)