fixed bug, added `comment' macro and `current-line'