commenting fix and tagging stub