improved keyword parsing