Add comments
Recognize @ in atoms/variable names