Fixes and location table added. Location adding and removing still need to be done.