- keyword editing
- bug fixes