Trying to fix comment and string handling, not yet fixed