Fix adding line to count when there's a line comment
Handle high levels of comments