Added nesting on comments and next word highlighting, as well as fixing an outdated row/column fetcher function