added location and place
updated stuff