Fix some of the existing commands
Add two new commands