have keyword parsing working correctly