Changed a table and fixed a few things