replaced names and stuff, attempted to make table sortable