added location. fixed some things
fixed merge