- Work on command
- Fix some features