Some typo fixes, cli updates