add more general keywords, added resons for this and possible consequences in the file implementation_notes.txt