- fix comments lose focus
- clean up