Tables Update and Pathing Clean-up