improve comments
improve parsing of emphasis