More changes to comment parse