progress on handling comments, whitespace