Minor optimizations and fixed keywords.txt