Add two new commands and fix a bug