Polished some stuff and updated the tables.yaml file