adjust keywords (structure and additions).
consider global switch and fix switch recog.