CLI: refactoring, add more to tw