some parser updates
parse comments