Better locations, changed userid to username