small changes after parser validation and lint