added more words, improved some regex'