more code refactoring, crossbar CLI modes working now