some tables and warnings fixed from overflow