fixing and the table, still need some things to get done