CLI updates and other stuff