changed so it actually matches since it's do not dg in normal mode
added added more comment types to surround, added tags location