updated keyword parsing
added nameDoesMatch