added some stuff
updated locations
updated locations