removed unused dicts. added some keywords