fixed some typos, commented out fb_user relating to location