Added support for comments, and jumping to a line