Add comments and location