Parsing improving, now handling comments