Added comments and location URL