keywords added, keyword matching fixed, shorter file