added location to message and comments