Added location and fixed json bug