added more keywords, better array init handling