Comments added for drugstores and fixes done