Fix errors in master

Reset Loc was commented out soooo...
LocTool had stuff in it it shouldnt have