Fix table + minor errors