ast  parsing - minor changes