added location to messages and comments