Many improvements, and more commands